Merge tag 'v2016.6' into upstream/latest
authorSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:13:49 +0000 (12:13 +0100)
committerSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:13:49 +0000 (12:13 +0100)
Release 2016.6


Trivial merge